xen: x86_32p: fix build breakage from 22456:1b6cc8c6d1c7

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/xen/arch/x86/x86_32/pci.c b/xen/arch/x86/x86_32/pci.c
index a5b8646e36f371bc11f49f2a708aedb930bb842a..1f77ebc835f66558fe535b46cadb8e09b7d48e67 100644 (file)
--- a/xen/arch/x86/x86_32/pci.c
+++ b/xen/arch/x86/x86_32/pci.c
@@ -11,9 +11,6 @@
 #define PCI_CONF_ADDRESS(bus, dev, func, reg) \
     (0x80000000 | (bus << 16) | (dev << 11) | (func << 8) | (reg & ~3))
 
-uint32_t pci_conf_read(uint32_t cf8, uint8_t offset, uint8_t bytes);
-void pci_conf_write(uint32_t cf8, uint8_t offset, uint8_t bytes, uint32_t data);
-
 uint8_t pci_conf_read8(
     unsigned int bus, unsigned int dev, unsigned int func, unsigned int reg)
 {

diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c
index a233c8307e1e64260ef36bee8e84705dd8833b6e..64baa3839ed607fcf86bb93580e42db4acc406c3 100644 (file)
--- a/xen/arch/x86/x86_32/traps.c
+++ b/xen/arch/x86/x86_32/traps.c
@@ -20,6 +20,8 @@
 
 #include <public/callback.h>
 
+extern asmlinkage int hypercall(void);
+
 static void print_xen_info(void)
 {
     char taint_str[TAINT_STRING_MAX_LEN];
@@ -333,7 +335,6 @@ static void set_task_gate(unsigned int n, unsigned int sel)
 void __devinit subarch_percpu_traps_init(void)
 {
     struct tss_struct *tss;
-    asmlinkage int hypercall(void);
     int cpu = smp_processor_id();
 
     if ( cpu == 0 )
@@ -549,7 +550,6 @@ long do_set_callbacks(unsigned long event_selector,
 
 static void hypercall_page_initialise_ring0_kernel(void *hypercall_page)
 {
-    extern asmlinkage int hypercall(void);
     char *p;
     int i;